Merge with xen-ia64-unstable.hg
authorKeir Fraser <keir@xensource.com>
Fri, 13 Apr 2007 15:07:48 +0000 (16:07 +0100)
committerKeir Fraser <keir@xensource.com>
Fri, 13 Apr 2007 15:07:48 +0000 (16:07 +0100)

Trivial merge